Enhance enum definition handling and validation #3124
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added a `string enumTypeName` parameter to the `ToEnumDefinition` methods in `ComplexTypeSystem.cs` and `DataTypeDefinitionExtension.cs` to improve enum field name generation, especially when original names are null or empty. Implemented a fallback mechanism to ensure robust naming. In `ComplexTypeBuilder.cs`, added null checks for `typeName` to prevent runtime errors and ensure valid type definitions. Updated logic for defining enum literals to handle empty field names, ensuring unique names are generated based on `typeName` and enum value.
Collaborator
Author
|
Fix for #3123 |
…ilder.cs Co-authored-by: Copilot <[email protected]>
…on.cs Co-authored-by: Copilot <[email protected]>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #3124 +/- ##
==========================================
+ Coverage 57.42% 57.46% +0.04%
==========================================
Files 357 357
Lines 69117 69140 +23
Branches 14203 14216 +13
==========================================
+ Hits 39687 39731 +44
+ Misses 25180 25163 -17
+ Partials 4250 4246 -4 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
cristipogacean
approved these changes
Jul 24, 2025
mrsuciu
reviewed
Jul 24, 2025
Contributor
mrsuciu
left a comment
mrsuciu
left a comment
There was a problem hiding this comment.
I think there is a little glitch on calling EnumMemberAttribute
Libraries/Opc.Ua.Client.ComplexTypes/TypeBuilder/ComplexTypeBuilder.cs
Outdated
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR enhances enum definition handling by adding robust validation and fallback mechanisms for enum field name generation. The changes address potential runtime errors when enum names are null or empty by implementing defensive coding practices and ensuring unique field names are generated.
- Added
enumTypeNameparameter toToEnumDefinitionmethods for improved fallback naming - Implemented null/empty validation for type names and enum fields with appropriate error handling
- Enhanced enum literal definition logic to prevent duplicate field names and handle edge cases
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| ComplexTypeBuilder.cs | Added null checks for typeName and enhanced enum field validation with duplicate prevention |
| DataTypeDefinitionExtension.cs | Updated ToEnumDefinition methods to accept enumTypeName parameter and handle null/empty field names |
| ComplexTypeSystem.cs | Updated method calls to pass enum type names to ToEnumDefinition methods |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added a
string enumTypeNameparameter to theToEnumDefinitionmethods inComplexTypeSystem.csandDataTypeDefinitionExtension.csto improve enum field name generation, especially when original names are null or empty. Implemented a fallback mechanism to ensure robust naming.In
ComplexTypeBuilder.cs, added null checks fortypeNameto prevent runtime errors and ensure valid type definitions. Updated logic for defining enum literals to handle empty field names, ensuring unique names are generated based ontypeNameand enum value.Proposed changes
Describe the changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue.
Related Issues
Types of changes
What types of changes does your code introduce?
Put an
xin the boxes that apply. You can also fill these out after creating the PR.Checklist
Put an
xin the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.Further comments
If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...